Merge main into feature/test-main#31
Open
aws-toolkit-automation wants to merge 8 commits intofeature/test-mainfrom
Open
Merge main into feature/test-main#31aws-toolkit-automation wants to merge 8 commits intofeature/test-mainfrom
aws-toolkit-automation wants to merge 8 commits intofeature/test-mainfrom
Conversation
* fix(amazonq): Can't remove document listener (#6214) * fix(amazonq): Can't remove document listener * fix: updating the mockitoKotlin version for fixing ci builds * fix: upgrade mockito-kotlin to 6.2.3 and mockito-core to 5.20.0 - Update mockito from 5.12.0 to 5.20.0 - Update mockitoKotlin from 5.4.0 to 6.2.3 - Remove snapshot repository since we're using stable releases - Update CodeWhispererTestBase.kt to use mockito-kotlin 6.x API syntax This fixes failing CI tests caused by downgrading from 5.4.1-SNAPSHOT. * fix(tests): downgrade mockito to 5.x for CI stability (#6232) * fix(tests): downgrade mockito to 5.12.0 and mockito-kotlin to 5.4.0 for CI stability Downgrade from mockito-kotlin 6.2.3 to 5.4.0 (latest stable 5.x) and mockito-core from 5.20.0 to 5.12.0 to restore CI build stability without requiring extensive test migration to mockito-kotlin 6.x API. * fix(tests): downgrade mockito-kotlin to 5.4.0 for CI stability Downgrade mockito-kotlin from 6.2.3 to 5.4.0 (latest stable 5.x) to restore CI build stability without requiring extensive test migration to mockito-kotlin 6.x API. Keep mockito-core at 5.20.0. * fix(amazonq): Handle directory paths in user-configured Node.js runtime settings (#6217) * fix: Handle directory paths in user-configured Node.js runtime settings * fix: fix unit tests cases * fix: Unit test cases --------- Co-authored-by: chungjac <chungjac@amazon.com> * deps: deprecate IDE 243 / GW 252 (#6246) * fix(amazonq): adding changelog (#6247) Co-authored-by: chungjac <chungjac@amazon.com> * add info banner pointing to ATX (#6261) Co-authored-by: David Hasani <davhasan@amazon.com> * add info banner pointing to ATX (#6261) Co-authored-by: David Hasani <davhasan@amazon.com> * fix: test cases --------- Co-authored-by: chungjac <chungjac@amazon.com> Co-authored-by: David <60020664+dhasani23@users.noreply.github.com> Co-authored-by: David Hasani <davhasan@amazon.com>
* Updating version to 3.103 * Updating SNAPSHOT version to 3.104-SNAPSHOT --------- Co-authored-by: aws-toolkit-automation <>
…ots: C:/Program Files/pypy3.11-v7.3.20-win64/python.exe (#6273) * fix: windows unit test failure File accessed outside allowed roots: file://C:/Program Files/pypy3.11-v7.3.20-win64/python.exe * r
…values in JetBrains telemetry (#6260) * fix(amazonq): adding changelog * fix(amazonq): Fix for incorrect TriggerToResponseLatencyMilliseconds values in JetBrains telemetry --------- Co-authored-by: chungjac <chungjac@amazon.com>
* build: drop support for 243 * fix: remove 2024.3 * fix: FIX_WHEN_MIN_IS_252
fix: merge from aws-toolkit-jetbrains
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automatic merge failed
Command line hint
To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):